Remove incompatibility between VT and RTT am: 7e87c16fd3
am: ba7f6cc82a

Change-Id: If26eaf1c6be1bb90c884bc283deccf8e94806d5c