am 4835c17b: am 1e122850: Merge "Fix issue #6609383: java.lang.SecurityException: Requires..." into jb-dev

* commit '4835c17b13c08693cf9a370df86d660818f8d391':
  Fix issue #6609383: java.lang.SecurityException: Requires...