Fix a broken test

Change-Id: Iacca0ab1b07219888de03e8c9947c8b661247758
Merge "Fix a broken test"