Merge "Deprecate nfc@1.0 for P." into pi-dev
am: e0050178e6

Change-Id: Ie4ece83f2f95615dd1df86e5c6ccef5245681762