Commotio - devices to vanir defaults

Change-Id: I99d17165ae8c1699a8856b11710ac7e19354f523
Commotio - Re-add some Day 1 changes

Change-Id: I28e6c5465f36aba6bdd80c6bfe80f6cb2491187a