DO NOT MERGE ActivityView be gone!
am: 94e82d9b0e

Change-Id: I54725b8840f0e839fbb4df5514b03f73a9d80245