Merge "Merge "Remove compiled classes list" am: 3adfec2de3 am: 3a3fc7a43b am: 8e50922263  -s ours"