am 4794b17a: am f37ac856: Clean up DeviceDefault style in API Demos

* commit '4794b17a54df0264172409e07abc48866019251c':