Merge cherrypicks of [4617311, 4617354, 4617355, 4617241, 4611726, 4611727, 4611683, 4611768, 4612064, 4612065, 4617374, 4617376, 4616313] into pi-dr1-release

Change-Id: Id86cd197ad6851833c27ae0f5dbbff9adfcddd72