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

Change-Id: Id8bd1ae7fa2f02d4a787a126913dedf484967566