Merge "Fixed SecurityException due to Fine Location permission denied." into oc-mr1-dev