HIC: Improve AccelerationClassifier
am: 6b312a09fc

Change-Id: Ic0e0db4d8c0cdd507352b18904fb5fb0747168e9