am 03d6a347: (-s ours) am 2ac5cb65: (-s ours) Merge "Fix pessimizing move."

* commit '03d6a34716dd0903fd439212e19bb32a485a38dc':