am f30c00fc: Merge "Fix incorrect static const"

* commit 'f30c00fc436264014338744f9902346f0642df3b':
  Fix incorrect static const