Merge cherrypicks of [6086654] into pi-qpr2-release

Change-Id: I978a6db494532b84be98221b8cf413ca266cab59