Merge "Hold the wakelock for suspend optimaztion only when it matters." into nyc-mr1-dev
tree: cae9ceba5d3af5e76120771b72d0bccb0691438c
  1. service/
  2. tests/