What it says. Also make the code and tests use them vs direct calls to dbapi. Partial-Bug: 1314732 Change-Id: Ic85b63a02722dd9657d1f2d2f1ad86fd8b78a061