[fixed] stability issue

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