revert for testing

revert: Merge remote-tracking branch 'koush/master' into cm-11.0