Merge "Add ActivityInfo logging." into oc-dev
am: 4b6219dab3

Change-Id: I6b4ac6518fab138ffa3b218e9471149018fb1f34