Merge "Avoid destroying Device separately"
am: a314384d

* commit 'a314384dc9785f97bf0f3bb9256f6ea2c765930c':
  Avoid destroying Device separately

Change-Id: Ia9b269456b01b9ba1f742c674449392fb6601599