WIP: Fixed test failure.

Change-Id: I7e9446be0e20cb9aeb01913854291b4f4a8c7f85