Merge "Adddress NFC API review comments." into nyc-dev am: 1fef88d8dc am: 225d221945
am: 3a5379285d
* commit '3a5379285d31ef594b31b8d6112a1930c022825a':
Change-Id: I0f4f385a0a1b40bf056af758cf8e8621d8800228
This commit is contained in: