Fix cherry-pick mess

Change-Id: I95edee861f6dafaa9fd6db5ad89875488033e02a