Merge "[automerger skipped] Merge "Remove unused resources" into sc-dev am: 2ab64731b9 -s ours am: c8e63e3bff -s ours am: e5bb086ce4 -s ours" into sc-v2-dev-plus-aosp