Merge cherrypicks of [1281396] into sdk-release

Change-Id: I8e1247233bc5deb1d77852e6988f23c04b2ae7ca