Add a5 from desire816_dev

Change-Id: Ic416879f858542dbed7ba22ba8db9a8f6a521563
Merge pull request #2 from TheMuppets/cm-11.0

Add a5 from desire816_dev