am f5d37174: Merge "Minor changes to validateAction()." into jb-mr1.1-dev

* commit 'f5d3717422cee76dd3674a2b25329d9df78098dd':
  Minor changes to validateAction().