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

Change-Id: I6f3ee3cd119c16863119f36cf0f6b0e14fa4be5a