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

Change-Id: I27052e1512518ef265a1bf5ba2bf9fac7dd00d1d