Fix some tests am: 65bc46b3b5 am: 9c8afeb1cd
am: 94bf69c22f

Change-Id: I7857d6a455894250777136ddb37b1ca052079cbf