track local device/common

Change-Id: I2e294be75f01bad8b6474819944cc17766627da7