Sync to latest SettingsIntelligence source code

Test: builds & robotests
Change-Id: Ie83909a9747afd07c541c6236224f079da8a2dc9
32 files changed