Reland "Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'" am: 83db8f75af am: b20409af35 am: da4667b75a
am: 340025151a

* commit '340025151a619931897234503cbebb267d2f8a7a':
  Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"

Change-Id: I1b6dae0960be5e66da81dab806d5c6a3033f8327