am 83c3110c: am 1818ea8a: Add dev settings to emulator.

* commit '83c3110c401fc21f6b4a47db7e9732a7b0d00e9b':
  Add dev settings to emulator.