Merge "Change bool, and string properties to *bool, and *string for cc" am: 265b1ab9 am: fc48bb3e am: 627ae70a Change-Id: I9b362813adbfa676d2980b8992c8c6c508dffdc6