[Fixed] stability issue

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