Revert "Importing the following changes from gmscore"

This reverts commit bff1cf7132aa783a19d7f4c61210cea4aa8f9890.

Reason for revert: Accidentially submitted

Change-Id: I8ebca56e908a9d790f1251b15ce7e3628bc2038c
3 files changed