[fixed] stability issue

Change-Id: I5e3f558c413a068db1124ead384f99f926a93551
Merge "[fixed] stability issue" into unstable