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

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