Merge "Deflake service tests." into arc-apps