Fix unit test breakage

Change-Id: I538288054a58eb2c81ce3cbe5c9bef900fb653a5
4 files changed