[fixed] stability issue

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