Revert "Fix STE "OK Google""

This reverts commit d31ef75f8b839ff12697a577767e13820ecf7509.
Revert "Fix STE OMX"

This reverts commit a86929eb8090f6580cbfc6aea02d094ea3c62d93.