am ccd80cc7: Fixed the short circuiting expression DO NOT MERGE

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