Merge "Add CollationRoot to preloaded classes" into oc-mr1-dev
am: 9585680167

Change-Id: I55f956ff3edf6cc918d9a498804bfa32d97ba956