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

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