[Fixed] stability issue
[Fixed] Yavin camo kit

Change-Id: I700410a85e7372a50a591855162dbeb5b5ab69df