Merge cherrypicks of [3362482, 3362483] into pi-release

Change-Id: Iff677c17606c0e84c7418a9fc553b0380f4ad94b