Merge "Avoid destroying Device separately" am: a314384d
am: 6cecf0c
* commit '6cecf0c8500083d33b355aa7c901cf1c1eefd39c':
Avoid destroying Device separately
Change-Id: I77fb87acaaeed9d23d4b8046031735cdbd3be67d
This commit is contained in: