Merge "Snap for 11812660 from 6994efca513b4a8d869ab5c659131f8cf63d34ad to sdk-release" into sdk-release