Merge \"Fix crashes in significant change when wifi hasn\\\'t started am: 11bb0926a6 am: d16695d899\" into nyc-mr1-dev-plus-aosp
am: e1949072f9

Change-Id: Ie7410ed21c2d3b51474adc0f6218d6a2651491c1
tree: 248481c4397abd7279328f6b2d9dd91ba64ba73b
  1. service/
  2. tests/