cleanup, edit 90userinit

Change-Id: I60ea368212b14aa349dd98a255f98fa16702d1b8
Merge commit 'b6ecd3f' into cm-10.1