Description
Code change that were committed as part of SENTRY-1769 has issues cherry picking as there are couple of files are refactored a lot and also have been renamed.
As the files were renamed in an attempt to follow google code style. This is something that is not needed if it is creating issues.