Merge "Treblize nfc config file location"
am: dfacb1bea5

Change-Id: I563585b3ea1a1327743a963df391c98a273a1cf2