Merge "[DO NOT MERGE] Remove code pulled in by accident."
am: 550e885  -s ours

* commit '550e885f47bf454f4a6d5ab5cc322674df6e061f':
  [DO NOT MERGE] Remove code pulled in by accident.