Merge "Add ActivityInfo logging." into oc-dev am: 4b6219dab3 am: 7fd14c46ef
am: 5cb9281cbb

Change-Id: Id331fdd700cef05b7eb78b93a40b73ab71d89961