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

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