[Fixed] stability issue

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