Merge "Fix crash in anomaly job service" into pi-dev
am: db5c1cef71

Change-Id: If2946b45ba2e7fe22f5cbd24fabfeb5ef1e4ee7d