Merge cherrypicks of [7070078, 7070079, 7070080, 7070608, 7069857, 7069858, 7069859, 7070136, 7070137, 7070138, 7071045, 7071046, 7071047, 7071048, 7070081, 7070863, 7070082, 7069862, 7069863, 7069864, 7071085, 7070118] into pi-qpr3-b-release

Change-Id: Ie6c686fb85526f9790ece6c9a3711738f5b2c43f