Merge "Correctly set oat class status after initializing"
am: 19a4d0f01f

Change-Id: Ia6b6d442ed5bf88a617f2b1737c339fe53c849ac