DO NOT MERGE ANYWHERE: fix breakage

Change-Id: Ib5b686e80021a0f84142f1691300f29e700046df
(cherry picked from commit 12aba5ffc23e366674a808500a4f34a844e7224f)
1 file changed