jellybean: bring inline with changes for cm-10.1