For some scenarios where NOT_READY is a final / steady state. Clear config. am: db66de1251 am: 25e3d26624

Change-Id: Ic6b96b1d4ba3e3a2cbd4e2f53892df5d4f9bfa26