Merge cherrypicks of [4186606, 4186647, 4186828] into pi-release

Change-Id: Ia28f920db4310d779c63fb5cc2df8a11870ed81b