Merge "Fix unittests broken by 545808a"
am: a2b947e0a5

Change-Id: If3f9fcf726bfc948c1c5ee66635ceed7144b3cc6