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

Change-Id: Ia5cad995eb3a92d10935ea8ea89f81687a169cfe