Merge "Change the 'dt' field of CVVM to 6" into nyc-mr2-dev am: 09072d2508
am: e129988b88

Change-Id: I28879b051c8dd3a8b67bd47e3290c7c91fd3393d