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