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

* commit '13274a2661eeb9aa4b2f82db6fd11edc22af1d8a':
  Fix logging errors inside ALOGV