[fixed] stability issue

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