Merge "Reduce cbrubaker bus factor by 2" am: 779be5e4a9
am: 16144f90f6

Change-Id: Id25a2f74fd12bc01de29b8ec6e24da1dc4ca383e