[analyzer] Address Jordan’s code review of r 179221
[analyzer] Address Jordan’s review of r179219