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

* commit '9461b93f7e46e71dd43b021084012ec337a5cee3':
  BQ: Replace items from back of queue

Change-Id: I3efbf1485d2fbb4dc5fed5e4b6fa5884faa0e6c7