Merge changes from topic "presubmit-am-e37767a8acfc463f909997fa16058fda"
* changes:
[automerge] media modules get more descriptive *.rc filenames 2p: 8cd6d143 2p: 48c82536
[automerge] media modules get more descriptive *.rc filenames 2p: 8cd6d143
media modules get more descriptive *.rc filenames