Superuser 4.3 fix.

Change-Id: I8849d7ba9c7cebfb14d9f09a8220430b5b97b3ff
Merge branch 'cm-10.2' into martincz