Merge "Update export location retrieval APIs"