Merge "Merge "BQ: Replace items from back of queue" into nyc-dev am: 9461b93f7e am: c5ec7db3c5" into nyc-mr1-dev-plus-aosp