am aa735116: am f30c00fc: Merge "Fix incorrect static const"

* commit 'aa7351167ef2f57c45b27b8a5595485a0e5c382d':
  Fix incorrect static const