Inherit device configuration before common

Change-Id: Ie1b3e9216c39a379213f353ffd9fcaa51f5d6027