Merge cherrypicks of [4685571, 4685572, 4681654, 4685504, 4685436, 4685437, 4682774, 4683234, 4683235, 4685438] into pi-dr1-release

Change-Id: I8dc38f80caee484ac880da467843b8d6045e7d9a