Fix VTS ValidationTest for 1.2 ops. am: a6b1dc7d9b
am: 6eeba37fad

Change-Id: Id51c7dfc22ec92d9673906973fbad212e7e59066