Merge "Avoid Rebuilding Core and VMTest Descriptions"