Merge "Remove all activities that do not successfully launch." into oc-dev
am: 1a08d200fb

Change-Id: I3c64a124b326b96ee38d55bef230d469e34e3db8