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

Change-Id: I76fb0c7d906533f9fb10026f43dde25ab45e7755