Merge remote-tracking branch 'weave/master' into aosp

0a8ab99 Don't allow registration of registered device