Merge "Added secondary owners on per-file entries."
am: 6d80c7a6e4

Change-Id: I64bd54a36864d957e30c2920698dea03717c6a0d