HIC: Improve AccelerationClassifier am: 4dc14b231e
am: 4a0f6aeb08

Change-Id: I330ac75a9409752f7f0632b11ea2cd5111d522e4