Merge "DO NOT MERGE: Add extra compiled classes" into oc-mr1-dev