Merge "Move per-file OWNERS directives to their directories." am: 2a7c887198
am: 4044496720

Change-Id: I772d27964a4b3add58bf57ca5f05a8d885450fb6