Change settings only for emulator am: c91a33d3df
am: 8738f6a884

Change-Id: I98c08d2f3a1bacb363c5268d0af06b096140f73b