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

Change-Id: I2b393b0583f295524eaaa79032f73abc0724469d