Updated for Android 4.3/CM10.2

Change-Id: I2bc074ed88db117c96a23fced518c40f0207f6e5