[fix] attempt to fix mantis #4767, very hard to replicate.

Change-Id: Ica44428ee2d6bd030f6042c6ce9014046d03a430
Merge "[fix] attempt to fix mantis #4767, very hard to replicate." into unstable