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

Change-Id: I946c82ce19f6a8ed7b889380ebd71eb8a4a26788