Improving customization in DeviceDefault themes.
am: 426e7a0f83

Change-Id: If548abe061e2005bf8b8598346b4a7fdb382faab