Few Modification based on performed SR EMBPD00121729
Merge branch 'master' of https://github.com/rhomobile/RMS-Testing