Merge "EDI: Ignore all double values that is NaN or Infinite" into nyc-mr1-dev
am: fc2c274b79

Change-Id: I3d673c1fbccf94b19d4c61a57bc63181a89c69b2