Merge "Drop '#include "ui.h"' from device.h." am: 2de12da142 am: 7e61191258
am: 39caabc7e3

Change-Id: I9a9de8eafc7e5730d83153fcb8aff409d2cee417