Merge changes from topic 'port-nfc-vts-AOSP' am: aeb3de7b3f
am: 3329d00a3a

Change-Id: I328a37e9944c51f63f20bbc8f85b8f9c14a1692e