Also split the API and DB areas in the table, although in the code itself the line between them is fuzzy. Change-Id: I6c1122bf22da1713b11d472c59cec422865eb1e7