[fixed] stability issue

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