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

Change-Id: Ie47f99d7201d92a58dac0808fd36638a3ef82f2f