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

Change-Id: I1c1c9b7f3e0603a34a285e71cd7d0c87f055ec9a