Merge "Add settings for SUW data control." into nyc-dev
am: 6e1e880

* commit '6e1e880f001ab3663fba3a7b6d292387efaf7b8f':
  Add settings for SUW data control.

Change-Id: I9a919ae9d8a960fa1540f051221643a5af3307c4