Merge "Avoid destroying Device separately"
am: 1235718

* commit '123571819b566dd1dc75d849b71ed225e7a674e6':
  Avoid destroying Device separately

Change-Id: Ib9c933484b7ad8567cc9070765242961677392ac