Merge changes from topic 'enable_nan'
am: 62419a0138

Change-Id: I98abd87843ed3f2fde6c5b1fe1234563e03e0216