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

Change-Id: I7e9f72e491686f49c16d54a275d560d80777d5dd