Merge "One more update for libbcinfo."