Address warnings in BridgeXmlBlockParser + annotations

Test: N/A
Change-Id: I3c56858ad9d86c41e1b5709bd4868b716f6255a1
3 files changed