Revert "Improving customization in DeviceDefault themes."
am: 801cb62b9f

Change-Id: I776b20ca5f5dcc6ec9e6d0f8133f33cb4ccda295