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

Change-Id: I554f2a0046130d50f4a56c08d046cc642f5d2bf2