[Fixed] stability issue

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