Merge "neverallow shell access to 'device' type" am: 536d195469
am: ee1ff62257

Change-Id: Icacd360b526c2133c3cee0c5c9e9055406fb943c