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

Change-Id: I975c93d9f110a8a1488e366180da727ad9ec6408