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

* commit '625cc92c3dbfec8d8b6e873cfeb54166f4d2b1f3':
  Fixing securityException issue