bad optimizations and missing classes'

Change-Id: I6cdea5775fa8cab232b880172a6a8df4ee216483