Merge cherrypicks of [4902354, 4902398, 4902399] into pi-qpr1-release

Change-Id: Ibfc3f8025621f9fc114ce2904e4bcb73b460d801