Fix merge error

Fix the build error produced by the invalid merge run by the
Gerrit auto-merger

Change-Id: I21eaeac31641af657e22179c933015757c8d5893