Merge "NFC HAL doesn't need readproc." am: f43e22b92f am: f9a6174df0
am: 0ffe59eee1

Change-Id: I5f9311428395b985aeceecf7e36c737f01bd32ca