[Fixed] performance issue

Change-Id: Iec7f614e6568f2259109c95f19c075dd010a3d41
Merge "[Fixed] performance issue" into unstable