Merge "Only log resolution when starting activities" into oc-mr1-dev
am: e4de49140d

Change-Id: Ia86f2d6097877e894fed40f12c5c49f26a1b690d