Fix unit tests am: 968e41783d am: e2eabf01d6
am: 044aae2c71

Change-Id: I6ffd22e5b835512dd8f9f08b9469751dd8094010