Merge android-msm-wahoo-4.4-pi-qpr1 into -pi-qpr2

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