[fixed] stability issue

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