Merge remote-tracking branch 'weave/master' into 'weave/aosp-master' e6b17ed Update examples README file e6fee32 Update command definition of sample daemon Change-Id: I67367217208e5baa32295a5cb79a08cb64826b1f