Minor re-arrangement to serve the needs for perf 3.12.0

Change-Id: I063c8bcadb70c94336c557be99e2cf4cf6e1b6a2
4 files changed