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

Change-Id: I8a7b78b7c71197eb5bdf54f0d52481303ea99b23