Merge "bm: remove sysfs_bcl label from odpm"