Merge cherrypicks of [4844655, 4844656, 4844102, 4844103, 4844104, 4844105, 4844695, 4844696, 4844697, 4844698, 4844699, 4844700, 4844701, 4844715] into pi-dr1-release

Change-Id: I7a6fb33e78b44e9503bedebc4a06bede480a07a2