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

Change-Id: Id20e7915b7b57f8f992b6d6dd3a21004b80ca601