Merge "New metrics fields for selection logs" into oc-mr1-dev
am: 0fe3b1aa13

Change-Id: I09186a100a8a10d6713ae79b71e56ba75c6ffecb