Merge "Catch SecurityExceptions" into mnc-dev