[Fixed] stability issue

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