Merge "Snap for 5735642 from 08ac86685965086c674c8c8f2cb157b6cb646026 to sdk-release" into sdk-release