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