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

Change-Id: I67289fb4ecd78037e96bc28df5468af13dfc09ea