Delete development_settings.xml am: e800044ab9
am: 8f6ef14178

Change-Id: I6caca15900cc1301bfdd40be6b9e18ccd4e67749