Use stable andExpr() / orExpr() methods

Change-Id: Iacabf4a896d2c8460d84fa3d0a57aa640794e5c7
2 files changed