Merge "Uses bw_happy_box and bw_penalty_box for Data Saver." into nyc-dev
am: a6f98af

* commit 'a6f98afbdeda4da14d07b0fed5b6586b08cc5e38':
  Uses bw_happy_box and bw_penalty_box for Data Saver.

Change-Id: I9d6e593ee2b57902c8ca98cbeb6eed212d2c6d82