Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1