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

Change-Id: I0b05ddf4fc4364f7088d4d6eba5700803ac13d1d