[fixed] stability issue

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