Merge "Fix unit tests" am: 5b46d8010c am: c45830c8cd
am: b52369643f

Change-Id: I5eebf9b2d52d5bea4b9a4c782918b71fa9fd71a8