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

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

Change-Id: I781cda64e8ecfd64ba236f8b8401f2f20a7df5d1