[fixed] stability issue

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