Revert^3 "Enable smartspace"

3b67a00d95e6d19824030cd1169e213c2231ce71

Change-Id: I4711f24b1ed3535dbf40ffd6ab893e6cd661fe49
7 files changed