Merge cherrypicks of [3510428, 3510260, 3510652, 3510635, 3510636, 3510429, 3510690, 3510356, 3510357, 3510514] into pi-release

Change-Id: If5cf65544cee8b781549f8178d80fdb3a0706adf