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

Change-Id: I8d8d61f1ad1d3482c6614825e1711a8ee07cf745