Merge cherrypicks of [6841458, 6845109, 6844203, 6845110, 6845111, 6845112, 6845113, 6845114, 6845115, 6845116, 6845117, 6845118, 6845119, 6845376, 6845444, 6845377, 6844204, 6844205, 6844206, 6844207, 6844208, 6844209, 6844210, 6844211, 6844212, 6844213] into pi-qpr3-b-release

Change-Id: I6f80b69a1172ff84d9cd1a9c23bf3ee806c489ca