Merge "NfcTile: Avoid NPE during boot up phase" am: 3a419fe212
am: 3628537476

Change-Id: I383b289d734ed72f248e004c8767357aca2ac578