[Fixed] stability issue

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