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

Change-Id: I07f192c701858c01bfe779b2ffecffc5ebad16e6