Merge "Update support library tests for unbundling" into nyc-dev