Merge "Revert "Add ActivityInfo logging."" into oc-dev