Merge "Remove ancient DB_READ/DB_WRITE constants"