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

Change-Id: I163f6ccaa1f6b67aefa7870acff37fdd0bf51cf5