am 1f3f55b4: Merge "Enable RT, round 2"

* commit '1f3f55b434ce324c5fdbe74db1982fea4812a2e9':
  Enable RT, round 2