Merge "Revert "Add ActivityInfo logging."" into oc-dev am: 61196fef1f am: 4e9f527d17
am: 1ffc7ca2d7

Change-Id: I5fcc8de81415a72b1733892b37712b1fe1ea287f