Avoid using DB avoidErrors() method

Change-Id: Iea0526714a941fea2f5b1c25b24da12167420c6e
Merge "Avoid using DB avoidErrors() method"