Merge cherrypicks of [3653390, 3653430, 3652255, 3652256, 3652257, 3653371, 3652400, 3653391, 3653372, 3652972, 3653411, 3653412, 3653413] into pi-release

Change-Id: Ibd5d1748b46b73a0e635f6a808186d78b3ed10f4