Merge "Accommodate NaN in new context menu methods." into nyc-dev am: a86d1e0
am: 27e0f35

* commit '27e0f3562027664cba20225403810fecea84fc83':

Change-Id: If176122136ad5521ae29dace96f7c15db09aa9ca