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

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