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

Change-Id: Ic9ded4bdba238d1383295c1907d7eded281784a0