Merge "Allow system to bypass DISALLOW_SHARE_LOCATION restriction" into nyc-dev