Merge "Put NaN checks where it is otherwise not expected" into rvc-dev am:...
Merge "Put NaN checks where it is otherwise not expected" into rvc-dev am: 38400273 am: baaa8453 am: 260e094e am: 4b8e505b
Change-Id: I72550201c15a1fea2b869da80eaea5d7d25f080d