Merge "Fix DbDaoUtil.java code"