Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'" This reverts commit 5734b2f40e6a4487efded994a82fb5a6fd3680a0. Change-Id: I8aefb2ffb039de67da7a7664c07f6e35b56adbc2 Reviewed-on: https://weave-review.googlesource.com/1636 Reviewed-by: Alex Vakulenko <avakulenko@google.com>