Fix broken unit tests am: 8c13d104c2
am: 3fc2b355f1

Change-Id: Ic565fe905e7df7756a9e063001921c6a2afddfcf