Fix some tests am: 65bc46b3b5
am: 9c8afeb1cd

Change-Id: I9ff78b8ea877ad473fde098793c06eac94570bfe