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

Change-Id: I9c8f77bf25e97f0f906ea31474f3b492d1dd3a04