Merge "HIC: Improve AccelerationClassifier" into nyc-mr1-dev am: f438720b17 am: 0633594e09
am: 426a0c141b

Change-Id: Ic49df820d33e627e7e3c6ec446f8c034af5ee245