Merge "Reduce GPU workload of pipeline_barrier tests" into oreo-cts-dev am: 4c26442e3...