Merge cherrypicks of [4732241, 4733700] into pi-release

Change-Id: I3aee63fa4d91a8d79e634690bdaa5f624376a397