am d90b11b6: am 13274a26: Merge "Fix logging errors inside ALOGV"

* commit 'd90b11b6c1905eb7c86dc2cf17314edb37ba4592':
  Fix logging errors inside ALOGV