Merge "revert deprecated sim activation logic"
am: e895000feb

Change-Id: I078fe4f72c1c01efa194864ce23957f2a83a4eab