[fixed] stability issue

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