Merge cherrypicks of [7038452, 7038453, 7038454, 7038455, 7038456, 7038765, 7038457, 7038458, 7038459, 7036635] into pi-qpr3-b-release

Change-Id: I62392120c5827487129c149b6b3bc9864c6b1a19