db1004 to mdb, not 1028

Change-Id: I262d2f83d1a0c21874f4913f1a65a0940a884e31
Merge "db1004 to mdb, not 1028" into production