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

Change-Id: I2c299607d74bb6cb10ff14a805565a9b423460ac