Fix build; broken import due to bad merge

Change-Id: I751962d59a75002c2c6b142387d9a69982c8b73b
1 file changed