Merge commit 'refs/changes/55/13055/4' of https://gerrit.slimroms.net/SlimRoms/frameworks_base into kk4.4 (reverted from commit 7c52fce6e43eb7253ac8d3982f1cc5e852a75eeb)

Change-Id: Ia0e17426e79b16f8e636affd34e8add51f67dfbc