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

Change-Id: I46d62c0ae7b1cb9ce2dc00a4e695aa4845627c35