This fixes the one new failure reported by hacking. Change-Id: Ifba58879acdacc60262d8a6fad5aee7cbdcc62f5