Merge "Fix autobundling."