Merge "Change getFragments() to return a List." into oc-dev am: 1b2bedcd76
am: b71472d28e

Change-Id: Ie1c06cacfae24614b0e40cb83117f5b25673c29a