Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Revert "PushOneTest: Remove unused mock ReplicationQueue" The revert done on stable-2.16 is omitted in this merge, since the ReplicationQueue is actually not used here. Change-Id: I4e869981a5585a2d24ff716f6c6a335acb051e68