Merge "Simplify NfcCommand and avoid NullPointerExceptions" am: b5c4e80ecd am: 7ba9270427 am: ffd0a7d95c
am: 5b6d397e21

Change-Id: I2cd3fe0600aeface31afa16f999df8065a418b21