Merge "Snap for 5590969 from 7df5ee3a18cef4abc166f10e47351527188df236 to sdk-release" into sdk-release