Merge "Simplify getting/setting class of device"
am: 019f6ed7bd

Change-Id: If794fc4119ee89e255548df771e48c9903cb79d0