Change settings only for emulator
am: c91a33d3df

Change-Id: Ie630b302fff2235977d512ca77e49abc3fd54895