BUG=None TEST=dm --tests=true --gms=false R=mtklein@google.com, bsalomon@google.com Author: tfarina@chromium.org Review URL: https://codereview.chromium.org/444303002