Merge from cm-10.1 to jb-mr1