Merge "Fixing securityException issue" into nyc-dev
am: 3d7939d

* commit '3d7939d20d92047e7ab068ad60901b3a0fd01c1e':
  Fixing securityException issue