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

Change-Id: I1798df76e5340d06ea5373882677ddd7a0e6e909