Merge "Always enable bandwidth control in Q"
am: 4be1419838

Change-Id: I8c2c8d3dffd21e696972c051dbed6323e1261a2c