Fix unit tests
am: 968e41783d

Change-Id: I24201de4fdd107ecfb9b85e896312341b98ee0f3