am a28a05e9: Cleanup: Make some classes as final

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