Merge changes from topic 'enable_nan' am: 62419a0138 am: 20d6e886a7
am: 6e318896ea

Change-Id: I5e5057b4e5ea146d133b4cea22602ff6650f29e6