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

Change-Id: Ic91cb7ae184df8306cdf6632b519d712a912e40f