fix the cherry-pick error

Change-Id: I7d51741c4d78579a176f0af1ce2e2f16b8aae044