Merge "Fix smart selection logging bugs." into oc-mr1-dev