Merge "Add brianji@ to OWNERS." into tm-dev