Merge "Removing dependency of All Apps test from 1P apps" into main