am 6ecd1005: am 11eae045: Allow incremental builds for settings.
am: a1bc287cc3

* commit 'a1bc287cc34a5d62c47f3c9768ab3d080234de7b':