am 372334da: Merge "Make private static field final."

* commit '372334da225b4265897d193df1ea692e601fa213':
  Make private static field final.