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

Change-Id: Ia58a37c5b75e3caa824c186c4647874ee2fb6bbd