Merge "Fix unit tests"
am: 5b46d8010c

Change-Id: I4e8e918e30436e6068acf73e73c40a5e6575460b