Merge "Change owner SettingsIntelligence" into rvc-dev am: 0eedd5cd67 am: 600160c8cd am: 03ac215e8e

Change-Id: I60b82d457694912c7b37c7e1470532a410f82ad3