Snap for 10900817 from 3891d995bb6458f557aa9a79b2f1ab29fbeabaec to sdk-release

Change-Id: I76859676513b843bb40996fe7d64a697075d08fc