Fix device identifier

Change-Id: If4879c3b94fa7ce3e12b8c1af3be3c01b12c3121