Snap for 11541002 from 18d1573a3ee263e73a6d056424ae8608ee5b8b4f to sdk-release

Change-Id: I817846a224131e02b938405b0fab843848aa630a