Revert "Fix STE "OK Google""

This reverts commit 29f950dc2f59e57768840ec1e8cc68ecdef8f7a5.
Revert "Fix STE OMX"

This reverts commit cd35a0a49d63753cdf021368afafc2f42b9bbe41.