Snap for 5925869 from a4e5b130c7d26c24bdd1889e402e187954f78df3 to sdk-release

Change-Id: I09f2a1d9b3b098b5e81fb0e670c7ada34a1fd5a9