Snap for 6348162 from ccf0112571de57a6fa2150ab0d41b85e27238cdd to sdk-release

Change-Id: Iacd17b64a8dc7d1d9c1eee32ca395389a778c97e