Snap for 6877830 from a69feef67bff053317e3b79bead3b3429e23d4fc to sdk-release

Change-Id: I46d1865d96d17dfc33a74161921ab98139c6938b