Merge cherrypicks of [4357125] into pi-release

Change-Id: Ia18b7b4cc68352936ea98bccef27d0c85b075786