Merge "DO NOT MERGE Turn off logcat logging for smart selection logs." into oc-mr1-dev