Remove incompatibility between VT and RTT
am: 7e87c16fd3

Change-Id: I5b223a76a7fdcdc5e9647aa191d06561932c24d0