Merge changes from topic "cp_bool8" am: 9820845e61
am: bc375324ec

Change-Id: Iccccc0b484bb440101795f02101c5d854628ec47