[fixed] stability issue

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