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

Change-Id: I90209b0e7b1abd1d96f1744ecd647913ad9e7d66