am fc0bcb32: (-s ours) am ccd80cc7: Fixed the short circuiting expression DO NOT MERGE

* commit 'fc0bcb3232bd73d4d44a4a5db73d663de82979d1':
  Fixed the short circuiting expression DO NOT MERGE