Merge "Update preloaded classes for O" into oc-dev
am: 9fb12725f2

Change-Id: I27200ac2f8858f755d7ff1d9fa4cc7f7eb406705