Merge "Avoid destroying Device separately" into nyc-dev
am: 1418269

* commit '14182697bbaeee70fd78bd12e8e7d87254415eae':
  Avoid destroying Device separately

Change-Id: Iecd5d3b1288dfab8a3713b8b54180e6e6d0de3d8