Fix BFQ V7r4 Merge patch

Change-Id: I37e4d16db07f656e61e94b6d38e424a77aef981c