Add some common stuff moved out from device

Change-Id: Ib4f0e39c8042cb590d6360bd7e9d4eb687bb2880