No assignment in conditionals!

Change-Id: I74811a919ad9df21a2bc4b2683b6c0a3d090fe0b
Fix spacing

Change-Id: I1704a3679780fba48e610d08b8609c29fcdaee21