Removed duplicate code that had broken 'run-as'

Change-Id: Id3e5ecccdebb4a7c881c6af3e1f465e0168cc940
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0