[automerger skipped] Fix Settings creating too many threads unexpectedly am: 48a0ff4304
am:21e8231523-s ours am skip reason: change_id I4afe1f641a11e218616772c1d5446efcc99cd1cc with SHA13e4c47dbc0is in history Change-Id: Id4a6950878e2f2efef68089bb9d9759e6c626834
This commit is contained in: