Merge cherrypicks of [5611163] into pi-qpr1-release

Change-Id: Ie0687c2540c013a9ef7bcdb6ffa96db8227f0086