Snap for 5234541 from ad15446bbd4148127924349ffe9af7cd01c4c5b1 to sdk-release

Change-Id: I1d4ab8e0b7482af7ef2e3dfe41f24f051cd6ed29