Merge "New NFC HAL." into ics-mr1