am 26f70db9: Merge "Remove surface legacy APIs and code." into ics-mr1

* commit '26f70db99f483be36caa7a4c84fec5de50bec034':
  Remove surface legacy APIs and code.