[fixed] stability issue

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