[Fixed] stability issue

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