Merge cherrypicks of [3571644, 3571645, 3571646, 3572287, 3571905] into pi-release

Change-Id: I50994b4a0496251842176de29ebd744f6ae9e50b