Merge cherrypicks of [4871059, 4868580, 4869372] into pi-qpr1-release

Change-Id: I4f32356294ed679fa8f6374099f471de85486a36