This reverts commit e8f2077fee.
Reason for revert: Introducing regression for gms core
Test: None
Change-Id: I644b10c1869c12e1622300de43bfbdb57fb583d8
This reverts commit e8f2077fee.
Reason for revert: Introducing regression for gms core
Test: None
Change-Id: I644b10c1869c12e1622300de43bfbdb57fb583d8