Merge "Change bool, and string properties to *bool, and *string for cc" am: 2def8cc8ba am: 6b224cc38b
am: 2821d14e11

Change-Id: Ie9cc04bc30bf0071196810b2e37dfd86bb196ba1