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

Change-Id: I94a38b8375529c17492adf346429a48d5969c733