am 0d702d25: Merge "Fix warning "suggest braces around empty body in an \'if\' statement""

* commit '0d702d250777d385983b9f7c18467a764b29a7ed':
  Fix warning "suggest braces around empty body in an 'if' statement"