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

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

Change-Id: I41de6e81ba75f53d3e75c06ee8fc35c05b55f403