Merge cherrypicks of [3586888, 3587308, 3587309, 3587310, 3587311, 3587312, 3587313, 3586013, 3585069, 3586729] into pi-release

Change-Id: I29949222dada2a31a9fd9a89609070f983233cd8