Merge "Change owner for Settings Intelligence" am: 1793ce010e

Change-Id: I454373a3d0c35e650a7f0ff7b24c47741d559ae1