Merge branch 'cm-10.2' into cm-10.2

Change-Id: I50f68aa709340d2be3131dac1f2d22ec0230a119
tree: 83a1c3518f924d2d359bc38ed3ee011a7083c85b
  1. default.xml
  2. README.mkdn