Fix device configurations.

Change-Id: I6117758b2669bfdd8eb72c7feb2b85c762f8b0f6
Signed-off-by: angelsl <hidingfromhidden@gmail.com>