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

Change-Id: Ia6251b11a2d5e91cbf81d6e79ad362f59871fd55