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

Change-Id: I7f11b4a66def7cb49ba20a4ab4772eea0a25ef16