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

* commit 'ec04a8d45bc6b01c3c2cd4a3064d194f7beeb386':
  Fix logging errors inside ALOGV