am 1417e96f: am 47269416: Merge "Address some comments for class flags"

* commit '1417e96f87871646b692e0eb8fc662dd9c4cbc9e':
  Address some comments for class flags