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

Change-Id: Ia99ab912db93c739ab485ac8d3983b9b733347d1