Snap for 7224597 from c7838c5a5cb9a7a1dea2a5791f7f8028cf97d118 to sdk-release

Change-Id: Ic6f468b5621bb7c8ce924e522f36e6a637674b47