Change device branch to fix dynamic changelog

Change-Id: I4cb089fc6a7469f6d41dd12b97026edf185bc1d2
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2