Merge "Default system theme should be DeviceDefault" into nyc-dev am: 10ed7de7ae am: 83e714bcc9
am: 3b7d251cb9

* commit '3b7d251cb9249c071d8b2e03bb1f32a681df15b3':
  Default system theme should be DeviceDefault

Change-Id: Ia608c2bc98a30566fa65c87448fa00a6d3cd9a13