Merge "Remove needless include for bcinfo" am: 77df0ef0ce am: 273375813e
am: 8e7bf3601a

Change-Id: I33f71272a8eb1a85879ea7b3e02b21529f4b5f44