Merge "Updates Drawers, Bandwidth, and test suite w/ latest lib changes." into...
Merge "Updates Drawers, Bandwidth, and test suite w/ latest lib changes." into oc-mr1-dev am: 6143b373
am: 0bbbf04e
Change-Id: I93e18c5722ba6a3ff41dd4c53c21085138a6fddf