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

Change-Id: Ia3ac938a14df46beb18d49803732ee953dabf0f3