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

Change-Id: I8376a7f4cfeeb77479f7dd4d6baf7ce762726910