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

Change-Id: I5529b0581974922a7c88a7aeab9c4e293a50e21a