Back to AOSP Nfc

Change-Id: I19e49655c4d9154012466f3d1f514f41fc93d3d7