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