Merge "add Note 8.0" into cm-11.0