Fix an error in the previous commit

Change-Id: Id4d96d51131a7cf1a8bca0d6d49f227b235d6f1d
Merge "Fix an error in the previous commit"