Fix unit tests.
am: f5a49018a5

Change-Id: Iec99b608152505c27860cde02152b411f101f9da