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

Change-Id: I2192134e3a19bbb03c36544d77de1fed3f61fb6c