prepare for switch to new superuser

Change-Id: I69c992928e6552a76ba880a399d08e4f59d348e3
Merge branch 'cm10' into cm10-mk