Merge "Add ActivityInfo logging." into oc-dev