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

Change-Id: Ia76e32bd2fbf8e4eac6058ae0762241ee7f84e7c