Merge \"Updated margins and spacing of preferences for watch type devices.\" into nyc-mr1-dev
am: 3a45f27ceb

Change-Id: Ia6cdf20fa4e4ad7c7988c2b613d4a35bdd01bbf3