Commit Id5d8ac09a38c656619f88a6f87b8f384fe4c55a8 broke some unittests Change-Id: If87a8b5acd5d0e21d5971aeec1cd783ba6b7b6ba