Snap for 8554636 from 9dbc6607f997a15ac67c7cb323e2f1abe759e6be to sdk-release

Change-Id: I4800c78ceca933b6d4f3835ef9d5b3f538ea3445