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

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