Merge branch 'android-msm-bullhead-3.10-nyc-mr2' into android-msm-bullhead-3.10-oc

October 2017.3

Bug: 64693798
Change-Id: Ib8f601aa8f81bec06828dd2c9a3f12a52c0e2120