Try to make test 1963 pass on fugu
am: 098e7a6758

Change-Id: I624b0847de585d0bd7a3a33a719746d2264452f9