Merge "Merge "BQ: Replace items from back of queue" into nyc-dev am:...
Merge "Merge "BQ: Replace items from back of queue" into nyc-dev am: 9461b93f am: c5ec7db3" into nyc-mr1-dev-plus-aosp
am: 98a85dff
* commit '98a85dff':
Change-Id: I3e092b67e26629b5f613252e2a05d593f0f236bb