Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'
am: 0265000198

* commit '02650001988801f874b9bcea46efab1303b902b1':
  Update command definition of sample daemon
  Update examples README file