Snap for 4953200 from ea6533a4d41a55bb9bdb19d793cf37be457bcff3 to sdk-release

Change-Id: Ia00bd29e07018ac52c53d1dae716b0aa8ca3af0f