updated analyzer as well
updated analyzer as well


Former-commit-id: ac2670f07d6edb0d68ef4f7f80f033fedb5fa5f6 [formerly 5c690f37a68f00b95babd5b3d8a229ea631b8d76]
Former-commit-id: 1711fce36c591bab9f72e99b524575976c7688ba
romancow/Sugar,andrewplummer/Sugar,andrewplummer/Sugar,romancow/Sugar