Snap for 13198286 from 42e76e32579c1603cfc328fb7c491d1fd22f12be to sdk-release Change-Id: I0e37936e7f26987931f33ed3e1acff5029506a6c