Snap for 10900817 from 22e925672048b9c8be72b70ed0a1140d2761bb25 to sdk-release

Change-Id: Ie1146d86586ca22fea27cde04dc2de2def18e877