Snap for 4429331 from 10a0659b1f37ffa6bbfc7e66fb5b840c73588bca to sdk-release

Change-Id: Id00e423a9c22d4dfa6390d2cd65251b3de2aaaa2