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

* commit '1cd2c24a772cc5ac1fc4ef5c3e7c173996cf3217':
  Minor changes to validateAction().