Merge cherrypicks of [3359449, 3359642, 3361564, 3359450, 3359451, 3361565, 3359507] into pi-release

Change-Id: Ia692c5043a476dfd669e6f9020c246764a1d6536