Snap for 5925869 from 7d1b2de95d7bbb3d52c1af92e90372689778a649 to sdk-release

Change-Id: I07d79af6c63ffa9bc5a9d59fd7f42e55245ca63f