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

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