[fixed] stability issue

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