Merge "Merge "Use filegroup name not contents in $(location ...)" am: 32bfd77b am: 43c0a4ee am: 42a34863"