Adds "| bool". Backportable to Stein. Change-Id: Ifa2aa387be46beb6da1d3c5a5e0da1b561af8cee Closes-bug: #1848937