Fix unit tests
am: 968e41783d

Change-Id: I21ca8e41e75eac4cc86db925c7c78060b203418c