Merge remote-tracking branch \'weave/master\' into aosp
am: 190346d65a

* commit '190346d65ac92f65cf5fd30b35e0e6a19db218e6':
  Don't allow registration of registered device