Address some comments for class flags

Change-Id: I354f48aefc37ce92c4d02cfce1723db0e28907bf
5 files changed