am 23c46bd1: Merge "Retain older message APIs since existing GPU drivers depend on them."

* commit '23c46bd1df3ad8de2bb4f072e53ef8ab1fffc3d1':
  Retain older message APIs since existing GPU drivers depend on them.