Reverse kang Wil Wheaton Recovery enhancements.

Change-Id: Ia9eace0ff0826801515b335ac6543c1271948612
6032

Change-Id: Ieb03cb1b06e3a9a2eaab61ac3d6c2e02922cea4c
Merge remote branch 'cm/cm-10.1' into jb