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

Change-Id: I9344a65bb11eea38ddc94a9e882c7a877f378503