Merge "Fix AccessibilityEmbeddedHierarchyTest failure"