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

Change-Id: I41829b5b9ed7e18d8c248d9bb0081047ef081203