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

Change-Id: Ie95edcead9b39e399a3b3fc51f121e17bc92c5fc
tree: 6aa5dcb83e94cc1f32ec5a3b0500b264d0109059
  1. core/
  2. packages/
  3. services/
  4. wifi/