Merge "logcat: do not assign 0 or NULL to global variables"