Snap for 5925869 from f207c52043d762d9cfbfd87986b5194c855a318a to sdk-release

Change-Id: Ia0a67d7bc5b9e1dce158252e3e2153dbd94e5d5c