Accommodate NaN in new context menu methods.

Bug: 28296401
Change-Id: I0ae6067e1ae01c342c1b39d6f64db5dcd02492d5
3 files changed