Revert^4 "Enable smartspace"

20744ed3b4623b379821af2945ef0cb77fe40648

Change-Id: I1eba412c6cb31684760af068b86a602cf6a53578
7 files changed