bug:20718535 Revert to established defaults of these two properties. Change-Id: I798cfa2e53b26eafd30b191ad6e3b721fe6bd249