Merge "HIC: Improve AccelerationClassifier" into nyc-dr1-dev
am: 06165f534f

Change-Id: I9bf58eefc326cd4ce67f38b8467d49e17be409d2