Upgrade to BFQ V6

Change-Id: I6e371388c4fa2aae1912395fd65ec692df6c8b2b