Fix build after rollback in commit 76ee7753ab42505bddf7770a3aa9072f659fc6de. Change-Id: I6bcb12be8f81cd7f20669253726507e4bc6fe3e5 (cherry picked from commit 049d382f)