Add Back cm superuser

Change-Id: I2a30d7034252ab42aaea525e99dc95daf8d59de8