Follow our own device u8660

Change-Id: Ieff821a4d1addfb6c873be54732293da1789783e