am 296a712e: Merge "Make a field final."

* commit '296a712e6b3fd48b5ace1128fa68547fdb8de84d':
  Make a field final.