Merge remote-tracking branch 'remotes/weave/master' into weave_aosp-master * remotes/weave/master: Replace https://www.googleapis.com/clouddevices/v1/ with https://www.googleapis.com/weave/v1. Set "WiFi discovery" bit of device flags according state of Hosted SSID. Return true only if device is hosting AP or if flags are being generated for SSID. Updated api_key, client_id and client_secret Add missing UI device kinds