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

Change-Id: I629f6f28d3dbc311aaf219ca468dcba305000fbd