Merge "Fix unit tests and coverage"
am: 1414f0e89d

Change-Id: I2f64ced00c8bfd0da1733c66f64ec80a2a6d7176