[Fixed] stability issue

Change-Id: I5c44cc8a5278610767fead3aba8f6ccfc4abe1b8
Merge "[Fixed] stability issue" into unstable