superuser

Change-Id: Idef89369f650116c20bd69e76bb0e6394ed99e8c
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD