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

Change-Id: I57da3187f0373aa45b8bac0786c34e80c87cef6c