Merge "Remove incompatibility between VT and RTT"
am: 1a04065a31

Change-Id: I99442952d820e84da2c952f767ce455cff94178a