[Fixed] performance issue

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