Merge "Add a test for bug 20708022."