Merge "Add tests for export location changes in APIv 2.47"