Merge cherrypicks of [12894601, 12894602, 12891329, 12891330, 12894603, 12894604, 12885923] into mainline-release

Change-Id: I55f9f3057be1cf15f2d7892c200a138493c6ae2b