am f37ac856: Clean up DeviceDefault style in API Demos

* commit 'f37ac8560aa6b90813df0aa0f4587d25b388dd06':
  Clean up DeviceDefault style in API Demos