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

Change-Id: Ib1af9b4e9447403a1ea2fb1fb8fbba89a460f9d1