[fixed] stability issue

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