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