Merge "Default system theme should be DeviceDefault" into nyc-dev am: 10ed7de7ae
am: 1abdeafbd9

* commit '1abdeafbd9630b6cce031c7b89af45c28198a3f3':
  Default system theme should be DeviceDefault

Change-Id: I022f07be53c24545135a3a500d1e14055bfce50c