Merge cherrypicks of [13475365, 13475021] into mainline-release

Change-Id: I6d12c9c28a0aee2258819d395e5ac02ef7a46872