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

Change-Id: I7a45359cb344f0dee4046e556b599e7646c7fd17