Snap for 11962796 from f44d40857282074bda9d3fed42b5c2dc3518a982 to sdk-release

Change-Id: I8bf81b31adea8ea520edc4d694e27eaeb3cc25a6