Fix broken unit test.

Addresses issues:
http://buganizer/issue?id=2056263
http://buganizer/issue?id=2058622

Change-Id: I951fabddbb141f86d5126b908fdff80fbf3b4d7e
1 file changed