Merge "Change owner SettingsIntelligence" into rvc-dev am: 0eedd5cd67 am: 600160c8cd am: 06f1684bb4

Change-Id: I8b94435c731e78bf8284662ec4396cd836c40959