[automerger skipped] Merge "Fix crash in anomaly job service" into pi-dev am: db5c1cef71
am: d932e04ccd  -s ours

Change-Id: Ia949a5dcd8fb506672705042bda7f96a47cc2499