[fixed] stability issue

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