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

* commit 'c5ec7db3c5ac96e771cfe07a78dcae13e0c79a29':
  BQ: Replace items from back of queue

Change-Id: Icbcf489db30f0509e1d0482b3f52aa6dafd24a09