Merge cherrypicks of [5426558, 5426683, 5424327] into pi-qpr1-release

Change-Id: I3a7fcdbec5abefd2e7d7e56594eb84bb71f213b0