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

Change-Id: I179996d5c4b79b19fdacd08049ee5fdc047fe1bf