Snap for 11962796 from 37c92978854bf517789b5a6db05f833af7d1325c to sdk-release

Change-Id: I06c347b914f284b595173e6a58f82bb06c9fd709