Merge "Add janitors and jophba@ to OWNERS"