Fix unit tests am: 968e41783d
am: db6c6d0ce3

Change-Id: Icdf9f0067718d4a29dad77b0d5dbf35490a97fe5