Snap for 10900817 from e877885533696352a67707b4ed61643351160a6d to sdk-release

Change-Id: Iccfa4f6893df96cf204df5b7f4d2878d2b821dac