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

Change-Id: I891215b6bd198ded78af491e9a69e71ffbb5d805