Merge changes from topic "nfc1.1" into pi-dev
am: eac7714719

Change-Id: Iefe548bdf42389af9b445e42f92d12ac895d202a