Merge branch 'android-msm-wahoo-4.4-oc-mr1' into android-msm-wahoo-4.4

June 2018.1

Bug: 76443140