Merge "Reduce cbrubaker bus factor by 2"