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

Change-Id: Ie521b0dba35acd4588568fbbb9a656ae18aa00d0