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

Change-Id: Ia6fdb36342a392d777da45f562d0173bdd4bebed