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

Change-Id: I352028c1974c38f2a88ffb6bdc49da7bd28d2204