Maybe this will prevent the config from occasionally reverting? Change-Id: I150bf06ad8a2938defce54f6f6d4b973ff74f35b