Merge android-msm-pixel-4.9-qt-qpr3 into android-msm-pixel-4.9

Change-Id: I5c2fdf07647d699a933620f143fe159ba8e5c5a6
Signed-off-by: Petri Gynther <pgynther@google.com>