Removed duplicate code that had broken 'run-as'

Change-Id: I649738fa168288452baa627ef20559f4b790d6ea
Merge remote-tracking branch 'github/cm-10.2' into HEAD