Fix invalid merge of last commit.

This is a fix for an invalid merge when rebasing.

TBR=fdoray

BUG=

Review URL: https://codereview.appspot.com/67700043