Merge "Set up anomaly test app in settings" into oc-mr1-dev am: 8cac6b07bc
am: c564686ec8

Change-Id: Id6c2f70cd547fad814e2bbf344f9e8d64fc8f64d