Merge "Bandwidth-related commands porting" am: 8dc60930ab
am: 160adaab84

Change-Id: I96549ecad3788a7b2c4c18e93dd25b583b8ec580