Merge cherrypicks of [4228383] into pi-release

Change-Id: Ia7dc31bc50ab350b102cd679d33652638fb7c0e1