Mis-grouping of && and || from CL ag/360551. Fixes bug 10798273. Change-Id: Idbc77e03d09f7ad5fcf1a5de98c6c14f0c63a6e4