[fixed] stability issue

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