Snap for 5735642 from 73f136ec946730e97d15b3f8e636fa6d556c3ca4 to sdk-release

Change-Id: I3d85e3e3d7c8b48a619f5d3bd692470f3041cf1e