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

* commit '4726941669584b30087ae7b4d142db4777d27015':
  Address some comments for class flags