Merge "Change bool, and string properties to *bool, and *string for cc"
am: 7693cd9c5d

Change-Id: I2a76a30b3e48cf3ba2364e738955f9985910440c