[fixed] stability issue

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