Snap for 5475808 from 9301a0b25ef1b03a56cc9429fd2e7471a7f49e35 to sdk-release

Change-Id: Id1b008597816391407807e05a98bbfd4ff7801b9