Merge cherrypicks of [4732401, 4732601] into pi-release-2

Change-Id: I641bf414253d5309f68cf2307c2fd39dc55fea52