Merge cherrypicks of [3907239, 3907816] into pi-release

Change-Id: I90cbf2491df8c8606b9744aa732647ec26d3bddc