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

Change-Id: Ie60b97b1d3e97e1461953fe34ca3d181d323e315