am 417d6589: (-s ours) Merge "DO NOT MERGE - Cleanup pointer access in adapter and font."

* commit '417d65897d40e7eacaff3837a1392c5f85d34868':
  DO NOT MERGE - Cleanup pointer access in adapter and font.