Merge "LegacySupport: include interface name in errors"
am: 89403778b0

Change-Id: I9f124d53fac97a51442ca7991ca0532fd7fc8e8b