Revert "Merge remote-tracking branch 'weave/master' into aosp-master2" This reverts commit ca54c12635b4af2786807c980723c5964b06903d. Change-Id: I5819d299e565a9ecb3cb7eaa21c3731b266d5c63 Reviewed-on: https://weave-review.googlesource.com/1486 Reviewed-by: Vitaly Buka <vitalybuka@google.com>