Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am: 61196fef1f" into oc-dr1-dev
am: 5345fce58f

Change-Id: I3b70dbc2fcdac06b83948fc7dfed82a5872028d7