Merge "Change getFragments() to return a List." into oc-dev