Merge "Sync a few commit ids" into dublin