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

Change-Id: I4886da880b20f98d59dffde5d53733c5e6251c7c