Fix unit tests
am: 72ec7ff768

Change-Id: I6103ede423ea01710925e67740095155d07859c8