Fixes for Superuser

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