Merge "Update transport tests for binding on-demand to support SDK 26 API"