Snap for 11566117 from 70add21618eed521d09fcdf7814dd04b521c88a5 to sdk-release

Change-Id: I5745bfee65bf67ee926d8a4d9bba014ed60b973b