Aligned with SlimROMs...

Change-Id: I99aee9283970b9b8614e80da1b82e0f92dcb891a