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

January 2019.1

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