[fixed] stability issue

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