Merge cherrypicks of [5141854, 5140474] into pi-qpr1-release

Change-Id: I06f63095c26ffb6cb482ea66b4f2663296c968ba