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

Change-Id: Id7028c2061a37990371f46ae8ef9c5dd5358c81f