Merge cherrypicks of [8066319] into pi-qpr3-b-release

Change-Id: I86ec97700963540f7ce9686e7ac0151812e58a8b