Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
tree: 1cdf2797ca6930b37cea2f5bcc682ed4d572a7be
  1. core/
  2. packages/
  3. services/
  4. wifi/