fix  alway apply

Change-Id: I322542cbaaf0f949024b2b0c1c030df673c24e2b