[fixed] stability issue

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