am fa9b0c6d: am e407bff4: am 3be35a39: Remove some unused resources and imports

* commit 'fa9b0c6d4920671fd8ade0557201d51d1be0d95b':