Snap for 6533464 from f1aef0d73ab38e5304694d9aefde87acdf77753f to sdk-release

Change-Id: If77bfde4bb3516ca6c36c899d702a854d224d1f0