Merge "Fix smart selection logging bugs." into oc-mr1-dev am: 9cbaa8c7e6
am: 646726f2f9  -s ours

Change-Id: I45725e8837afed6d02081971bb78a927099b36f2