Merge cherrypicks of [4847409, 4847410, 4851733, 4851734, 4851815, 4851835, 4851836, 4851837, 4851855] into pi-dr1-release

Change-Id: I2fd8992e9110b3416b7f8bd81b1fd48f4d616cda