Snap for 9979206 from f0933bad949a6a1034f0e50d28fa35429cb57695 to sdk-release

Change-Id: Id6f67eca7549ebbc2da2a57c858e4bb0530e4305