AOSP_TMO: update for cm-10.2

Change-Id: Ie18463582522e5463a636ac39b1dafb7a6f194d1