Merge cherrypicks of [4761360, 4761286, 4761380, 4761400, 4761401, 4761402, 4761403] into pi-dr1-release

Change-Id: Ifae2764bf6b17ed63a55a2ffc913751edd442e03