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

Change-Id: I65754671dac41c4257e1d0926c0a8cdc3aae8921