[analyzer] Address Jordan’s code review for r183451