With Ken, fixed resources not release issue

Change-Id: I45449010814c3cc11458c56e93adf013178e3f40