DO NOT MERGE Merge remote-tracking branch 'goog/master' into mm-wireless-internal-dev

Pull in WiFi changes from goog/master to partner branch.

Merge from d7ff03d48f825360eec2a371e3361306f2fd721b