am e7bdd991: am a28a05e9: Cleanup: Make some classes as final

* commit 'e7bdd9910141c11701751be32bfed67956a950b6':
  Cleanup: Make some classes as final