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

Change-Id: I0a3060b8b6918b32f443a0f5eb238c931eef42b1