Merge cherrypicks of [4720926, 4723688, 4721047, 4721048, 4721049, 4721050, 4721051, 4722425, 4722426, 4722427] into pi-dr1-release

Change-Id: I78fa8eea3823dfb75577535251a7fde4df06c734