Merge branch 'FixClang5NumericTraitConstantsExport' into release

Change-Id: If8e3fcf8e4434899d512194393b759a84a3ae339
Merge branch 'release'

Change-Id: Ic8968bd71bb03bec03737de08c1f8a0e69e40921