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

Change-Id: I01029ae8a05578e615683f326fe66df0b1e05bf8