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

FEB 2019.1

Bug: 119688314
Change-Id: I22e5919ac7b603bdc7fd75d63f9c252bde39ea40
Signed-off-by: Robin Peng <robinpeng@google.com>