Merge changes from topic \'api_review\' into nyc-dev am: a0676c9
am: a6c9a89

* commit 'a6c9a892365864f715da31210304cdc3ada6a15b':
  Api review: Settings.
  Reduce spacing.

Change-Id: I4922a4e4beb8544c10e246b764097048328ec20e