Bug 58158 - Retry on internal_api_error_DBQueryError

Change-Id: I7f90e74f93316e0e81f1b42ebc348456227c0fb8