am df947299: am 2b126b6c: am 46ec729a: Merge "Clean up unused resources" into klp-dev

* commit 'df9472996a73eba58fdb80448dfe6c15a8aeaba4':
  Clean up unused resources