Merge "Disable verbose logging." into oc-dev
am: 003b5a783b

Change-Id: I0039e51315eba1453026fa0dac565449838dce85