Cherry-pick dbserver fix to resolve merge conflict.
Cherry-pick dbserver fix to resolve merge conflict.

blindsighttf2/Astron,blindsighttf2/Astron,ketoo/Astron,pizcogirl/Astron,blindsighttf2/Astron,ketoo/Astron,pizcogirl/Astron,blindsighttf2/Astron,pizcogirl/Astron,ketoo/Astron,pizcogirl/Astron,ketoo/Astron