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

Change-Id: I5400d13731580eb45137f3a548c89892e1176d5e