Merge changes from topic "cp_bool8"
am: 9820845e61

Change-Id: Ia40d495f1376ed6f7a9a631d17a70c69510484c8