Use raise Err(...) instead of raise Err, ...

Change-Id: Ia08d34e42c476f3a196d54413c251ae0d6721103
Merge "Use raise Err(...) instead of raise Err, ..."