Merge cherrypicks of [7068682, 7066360, 7066361, 7066362, 7068985, 7068986, 7068987, 7068800, 7068004] into pi-qpr3-b-release

Change-Id: Ibfe2c06a97eeb27d621ee889573bb0966b5c5578