Merge "minor change to keep it building" am: f369b2f771 am: c728c5e185 am: 1db0e41455

Change-Id: I5fc3686a1457001fe1c9662dd550d0289d4c3435
tree: 82c599b6312d55daddbe2c2d9a4977727d7b941d
  1. core/
  2. packages/
  3. services/
  4. wifi/