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

* commit '2b126b6c403d107974477654de223fa1ea8941fe':
  Clean up unused resources