Merge "PrintSpooler: Fix EqualsNaN in test" am: ffcf3ff77d
am: 57f653a155

Change-Id: I03dee58beeb6247a7786fef455eae646fb243121