[fixed] stability issue 

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