Snap for 5735642 from 063e04f971d76addd29410fc1797f6b96f7afcf4 to sdk-release

Change-Id: I6893d599f5c66afabf876f5840e4b0ab81031856