am cf7058f7: (-s ours) am 28ad889d: Remove unused resources (DO NOT MERGE)

* commit 'cf7058f73c7373d69316f794b1f7055914ce9379':
  Remove unused resources (DO NOT MERGE)