Aligned with SlimROMs...

Change-Id: I9296d07e987dbd7f1c5c16eb4da2b8edd84b3c61