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

Change-Id: If62a47ee3cefc509cd0fa406ef5cb43a0f521280