Merge "Clean-up PersisterQueue tests" into qt-dev
am: 33f68ebf93

Change-Id: I2fc160df3eb60ce41704c9113b183e7f6573870b