Merge "Fix bugs in CarUiResourceLoader." into nyc-dev