Merge "Fixed testcase for Nfc VTS" am: 2a83a41990 am: 49116243dc
am: c65c19ae0d

Change-Id: I71665469d2d72772487a0fabd62deeedbd14c203