Merge "Use the proper style for the SpacePreference." into oc-dr1-dev
am: ff8312b36b

Change-Id: I44d02a388a2d8c9dd8a797f78fce67a856bc22e5