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

Change-Id: Ieea36699ef83f3ace40d6ef56b590f5db4604dc2