add parameter verification
Merge pull request #1243 from ruil2/comment

add parameter verification
Merge remote-tracking branch 'upstream/master' into travis.android