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

Change-Id: I1ead0fd55eb35fd69a4c8e3de5a1449ce296edd9