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

Change-Id: I588c1a5d59a5e3455d6c19dfcb18b9ff59283e15