Use our device common

Change-Id: I4f722bc1996c833e56f57e5b5d68d3ac1eacfd0a