[fixed] stability issue

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