[Fixed] performance issue

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