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

Change-Id: Idabefc3d91da9e152d82a12b4723f1a5f1f127c2