Merge "Fix loop in SF flushTransactionQueues" into qt-dev
am: 3f8312b5dc

Change-Id: Icc5bc77eabdb88a9222ceaef54959f421b48ff49