Merge "Fix local variables with null constant" am: 882bec7350
am: b2e5b8d7ee

Change-Id: I530f459f02eec7425bd94973efaa1c46e71309ca