am ea779c88: am adfebbcd: am 93773991: Merge "Add some missing \'static\'s."

* commit 'ea779c886b00c022bbbc04e908748400d35f34f0':
  Add some missing 'static's.