Snap for 10900817 from 29f7cd3acf1680e79d74a428c569a120c775ce0b to sdk-release

Change-Id: I10e7c675d9339affb088fc10472a0c77369be341