Merge "Retain older message APIs since existing GPU drivers depend on them."