Merge "Turn off logspam" into oc-dev am: 6fb15ea9d4
am: 541f9cf576

Change-Id: Ib2846b83d6775c124f1b2dc1ca1b4a496bc14446