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

Change-Id: I5be8aab32f4918814ab2273f608b38d4403b24d0