Merge "[Resources] house keeping in TypeList" am: ff2e03cfce am: 516bd5f862
am: 2d604852ce

Change-Id: I983ab5312b484a8d3f8adafd693f2435c460ab5a