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

Change-Id: I95142a732739d20882f786ff800b5b647adadf1c