[fixed] stability issue

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