SaberMod

Change-Id: Ie413f4e03cf94178781e5b97986938960f996dc1
Merge android 4.3.1_r1

Change-Id: I813158cca87fd4e28f6e1dece2f61bcdaf135209
Revert "SaberMod"

This reverts commit dde4f67d844f5f86d664976504ab6689a3e1c23a.