Merge "Reorder ImsFeature initialization to handle STATE_READY"
am: 3876ca9d81

Change-Id: Ib0b4a3711af362a0d535ebaa804e57c7a84f6b2d