Merge "Keep verbose log statements, but silence them by default" am: 9a4842894a am: b4dfe1c017
am: 71085b5a77

Change-Id: I60026496b923e303f97adebb365f24fe3a25d845