Merge "Move settings intelligence grant file to /product" am: eaeedb1c0d am: d6e981eaa0
am: a78fb89cb0

Change-Id: I05dcf630fd493d17d8fe51c4090d1cbdb4efb10b