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

Change-Id: I807b06df300beb29926c66d51a0f3e11fb648234