Merge cherrypicks of [13584573, 13585286, 13584574] into mainline-release

Change-Id: I189a8899c48b4657de907b4746c4d4d577429e44