Merge "Handle renamed "super" device correctly"
am: 5d55580fe1

Change-Id: I1ca846f2bafa3e7e4e6f91d9bf6b71ba957ec9e6