Merge "Stable Branch for Iruya:VSwitchperf"