Merge android-msm-wahoo-4.4-qt-qpr3 into android-msm-wahoo-4.4

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