Merge cherrypicks of [4963114, 4963471, 4963115, 4962921, 4963491] into pi-qpr1-release

Change-Id: Icbb8916d8a497c8507844f55bca7677958ee6f81