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

Change-Id: If46c2c0fe3558da71399375b92c4e94e50f2e9a9