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

Change-Id: Iace1a2236b1330f0c210270243474855a643e23a