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

* commit '8551f03acc1ea00258dd7aeee8f4b584510de734':
  Avoid destroying Device separately

Change-Id: I67c5cf149143bff0629d20cc23730a022674b47c