Change-Id: If46ae529196cd0e2842cef73c1341508314118c9 Merged-In: If46ae529196cd0e2842cef73c1341508314118c9 Test: booted with debug flag (cherry picked from commit 91f8142b)