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

Change-Id: I08164844e37e12b7221298620bf3a66cc2087c2e