[Fixed] Stability issue

Change-Id: Ib61dd0b37cfeec246e5fd6546f1a725d83d201de
Merge "[Fixed] Stability issue" into unstable