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

Change-Id: Iae88987b4ae830cb6b0065bbf1421e5d8e6aa81a