[fixed] stability issue

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