Merge "Fix logging errors inside ALOGV"