Snap for 5475808 from fe7fa3a50dafcd8bf2d59769ad2676737c7e2346 to sdk-release

Change-Id: Ia582d479a42c0dc44cc5e0b5c45f8978846bc6b4