Merge cherrypicks of [4263232, 4263453, 4262483] into pi-release

Change-Id: I936d86bfe75804ba76e58eb27ed774ca1cc13f57