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

Change-Id: Ifa59b97460abaac5981232e9d9045be92397d938