[automerger skipped] Merge "Remove incompatibility between VT and RTT" am: 1a04065a31
am: 69bff5103d -s ours
am skip reason: change_id I2cc2117f1c57c78db1a3a3a1ddc82e7a2290d12b with SHA1 7e87c16fd3 is in history

Change-Id: I32df4205803dfa7abc05b5be8fa4889b1c00cf3d