db69,71 to mariadb

Change-Id: Icda356252da0885890b48df675943a38ce0ff7a6