Merge changes I4872f8ba,I92039f29,Iaad13e13 am: 767ac317e2 am: 717238a614
am: 44e9b81c54

Change-Id: I9c38d1254f82b50f4d1e953e72bf15a46562d3b8
tree: 0360e217f0f82c026e771719fe86a8ee30e314e0
  1. core/
  2. services/
  3. wifi/