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

Change-Id: I00dfe6ac59782f431b5f50f059055d9537b73ae8