Merge "Add additional anomaly types." am: 64bf0a791e
am: e709ac7a4c

Change-Id: I5b813e1357baae09566285dacb30e44169e9b16d