Merge changes I37dd459d,I1959f308 into rvc-dev am: d7aa055b61

Change-Id: I73f7aa761e1377dfed0ab234af4a2bc6a73a91a2
tree: 7e197e642edb19e9ca8bd0d98b314e0e4090aef9
  1. core/
  2. packages/
  3. services/
  4. wifi/