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

* commit '340b8dcb7b75ea0ced922648e37c551016dce44e':