fix NFC for lollipop

Change-Id: I7e481d453defc99638a9bbcc5b2954c9b94ff2b0