Fix test failures
Fix test failures

ed-chin/EarlGrey,saurabhj80/EarlGrey,sskhandp/EarlGrey,sskhandp/EarlGrey,google/EarlGrey,google/EarlGrey,artyom-razinov/EarlGrey,artyom-razinov/EarlGrey,saurabhj80/EarlGrey,google/EarlGrey,sskhandp/EarlGrey,sskhandp/EarlGrey,sskhandp/EarlGrey,ed-chin/EarlGrey,ed-chin/EarlGrey,saurabhj80/EarlGrey,artyom-razinov/EarlGrey,artyom-razinov/EarlGrey,google/EarlGrey,saurabhj80/EarlGrey,artyom-razinov/EarlGrey,ed-chin/EarlGrey,saurabhj80/EarlGrey,google/EarlGrey,ed-chin/EarlGrey