Merge "PrintSpooler: Fix EqualsNaN in test" am: ffcf3ff77d am: 57f653a155
am: b328fbc6b8  -s ours

Change-Id: If5a7d31d7ce73b3b3309434bb05ac1a6aeee574f