Merge "Snap for 6877830 from 0e7bb0182df1067a44505bd577a472aee7a43e97 to sdk-release" into sdk-release