Merge "Ignore LV debug info when the type doesn't match"
am: 1e2aa00fe8

Change-Id: I28d549b8c4fde87ec59b6ff6b076fc7308ce976e