Merge "Remove needless include for bcinfo"