Merge cherrypicks of [4176570, 4177121, 4173469, 4173226, 4173227, 4173228, 4173229, 4173211] into pi-release

Change-Id: Icf16d1cadcedf230d5d7cff459ca010fe45efa20