am 06b8c2ff: am dff2d842: Merge "Fix bad rebase."

* commit '06b8c2ff33e17fe384ef7d1c9706034d91cafc9d':
  Fix bad rebase.