Merge "Add a test for b/62688874."