Merge "Treblize nfc config file location"
am: 81d6718211

Change-Id: I457b0bfff8725d950828c3dac2d0bbcab30b7d81