Just in case add "xt897c" to OTA assert
Merge branch 'cm-10.1' into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2