Merge "Simplify NfcCommand and avoid NullPointerExceptions"
am: b5c4e80ecd

Change-Id: I2dcff4d7d0b0bdc5b344f08ce5d563da0a272ddf