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

Change-Id: I66f631aad38b0c94366a1114162da9d08644ff7c