Fix broken unit tests am: 8c13d104c2 am: 3fc2b355f1 am: 82491d7dc2
am: d54b4b0048

Change-Id: I769d272a5810d937c36a41111cd390ab4ce94b86