Merge "Update to match fragment APIs."