Merge "Change owner SettingsIntelligence" into rvc-dev am: 0eedd5cd67 am: 4df2aa7426

Change-Id: Ied8ba0f5c476017ef3cc4774095ebe159671fd9c