Merge "Revert "Relax conditions to retrieve LV debug info"" am: cfe8c963dc
am: 373c3f3395

Change-Id: I52303ff8941224fe3fb1bcad063cc8f930b042b6