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

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