Merge cherrypicks of [4691303, 4690277, 4694738, 4689486, 4694439, 4694440, 4689487] into pi-dr1-release Change-Id: Ib3d18ce7403888d3b391da93e81e7ec813e8ae97