[automerger skipped] Merge changes from topic "cp_bool8" am: 9820845e61 am: bc375324ec
am: e8a96765f3  -s ours

Change-Id: I52c6e23cfb5929f81ce2ea112585e6cc91a77c54