Merge cherrypicks of [6916730, 6913831, 6916555, 6916731, 6916732, 6916733,...

Merge cherrypicks of [6916730, 6913831, 6916555, 6916731, 6916732, 6916733, 6916734, 6916735, 6916736, 6916738, 6916739, 6916740, 6916741, 6916942, 6916715, 6916717, 6916718, 6916719, 6916720, 6916721, 6916962, 6916964, 6916966, 6916967, 6916968, 6916970, 6916972, 6916974] into pi-qpr3-b-release

Change-Id: I87e8e29a2bee24413883a530fba285ded315ff25