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

* commit '76ddac5f35f6c5967fffb49103e750bb69ec707e':
  BQ: Replace items from back of queue

Change-Id: Ief8c51b8f8dac85663ea2ec25a36e80958a9159f