Merge "Address API feedback for new fragment APIs" into oc-dev