Merge "Fix failure vts tests:" into oc-dr1-dev am: 55967b136e
am: 6c63af4146  -s ours

Change-Id: I1929b00c5da15ffbd6f1b25f5535782ce04b26e3