[fixed] stability issue

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