copy-paste bug Test: manual. Will add unit tests for it. Change-Id: I9494271a8a407b0f3c5fc0138c1afb4925c69b79