Merge "HIC: Improve AccelerationClassifier" into nyc-mr1-dev