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

Change-Id: Ic85687fb56623511062093bffe22c2e9e6584a2b