Bug #8419 - Added platform info missing on exploits
Re-fixing 8419, consistency is important.
Land #2491, missing platform info update
Merge remote-tracking branch 'upstream/master'