Merge "revert deprecated sim activation logic" am: e895000feb
am: 6d194feae1

Change-Id: I27301540daddf4c017ccb40c1e30287c925c8033