am 81f06a6d: am 1603e30e: am 6ef845d3: am b4589115: am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev

* commit '81f06a6dce17ea44fd6a3110a15aec490cea4b2b':
  Remove dead NFC unlock code from fw/base