Track SuperUser from CM

Change-Id: I45efa48bcd1830fc01ab2536a2bada9b532f53b8