Snap for 6355086 from bac3f8ae4d716e0dd07d1513acc94488d2dd9e52 to sdk-release

Change-Id: I4c0d9282fc03a95cd2a5dc68f6936359c8648975