bring inline with latest devices specific changes from cm-10.1-exp