Merge "Debug: Initialize local to false" am: 33d404efb0 am: 3327b49429 am: 0bcb437677
am: 7779734d82

Change-Id: I3c96669f0a7b7fca2e3f120adfa939286f40f6f3