Group public and private properties

Change-Id: I2e399ee311ba44ae9652e75ee210663c3b28614b
Merge "Group public and private properties"