Merge cherrypicks of [6909075, 6907367, 6908059, 6905571, 6905572, 6905573,...

Merge cherrypicks of [6909075, 6907367, 6908059, 6905571, 6905572, 6905573, 6905574, 6905575, 6905576, 6905577, 6905578, 6905579, 6905580, 6907712, 6907713, 6907714, 6907715, 6907716, 6907717, 6907718, 6907719, 6907720, 6907721, 6909142, 6909143, 6909144, 6909145] into pi-qpr3-b-release

Change-Id: I38ce4056eaf4bfb5b01bb532737c057c96f0ac78