Merge "Merge "Use filegroup name not contents in $(location ...)" am: 32bfd77b79 am: 43c0a4eeae am: 42a34863f1"