[Fixed] StatePack Issue

Change-Id: Id7214a89748ee5b72e6a536ded61b0e6b8109661
Merge "[Fixed] StatePack Issue" into unstable