am dff2d842: Merge "Fix bad rebase."

* commit 'dff2d8422cee19d35d7eac467ac0fc2315c1c899':
  Fix bad rebase.