1. Renamed some attributes to not overlap with already public ones since they are not dedicated for external use. bug:6094713 bug:6104108 Change-Id: Iab8a906680ebcaa91f020ffbf55cf603a1071437
201469f5
bb7f590a
1890fa82
79d84930