Merge "Allow shell access on /dev/uhid node" am: 216b377d78
am: c1e8f82545

Change-Id: I2db7693bb8bb77e396602caa37286090791a4689