Snap for 5735642 from e435798b9f593c5c4f6d75833f6c90d8d42ecb5c to sdk-release

Change-Id: I22f70224094c4d18076f61b870477d5cf12b24b9